[9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored) by sourcery-ai[bot] · Pull Request #127 · dataiku/dataiku-api-client-python

sourcery-ai · 2021-03-22T17:03:59Z

Pull Request #124 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the task/dss-91-improve-jupyter-api branch, then run:

git fetch origin sourcery/task/dss-91-improve-jupyter-api
git merge --ff-only FETCH_HEAD
git reset HEAD^

sourcery-ai · 2021-03-23T14:44:04Z

-        definition = {}
-        definition['name'] = cluster_name
-        definition['type'] = cluster_type
-        definition['params'] = params if params is not None else {}
+        definition = {
+            'name': cluster_name,
+            'type': cluster_type,
+            'params': params if params is not None else {},
+        }
+


Function DSSClient.create_cluster refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2021-03-23T14:44:04Z

-            if isinstance(v, str) or isinstance(v, unicode):
+            if isinstance(v, (str, unicode)):


Function DSSClient.make_entry refactored with the following changes:

Merge isinstance calls (merge-is-instance)

sourcery-ai · 2021-03-23T14:44:04Z

-        ref = self.client._perform_json("POST", "/projects/%s/duplicate/" % self.project_key, body = obj)
-        return ref
+        return self.client._perform_json(
+            "POST", "/projects/%s/duplicate/" % self.project_key, body=obj
+        )


Function DSSProject.duplicate refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2021-03-23T14:44:04Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSDatasetListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_datasets refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-23T14:44:05Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSStreamingEndpointListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_streaming_endpoints refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-23T14:44:05Z

-        if as_type == "objects" or as_type == "object":
+        if as_type in ["objects", "object"]:


Function DSSProject.list_model_evaluation_stores refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-23T14:44:05Z

-        if not "standard" in obj:
+        if "standard" not in obj:
            raise ValueError("Missing 'standard' key in argument")
-        if not "local" in obj:
+        if "local" not in obj:


Function DSSProject.set_variables refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

sourcery-ai · 2021-03-23T14:44:05Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSRecipeListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_recipes refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-23T14:44:05Z

-        elif type == "prepare" or type == "shaker":
+        elif type in ["prepare", "shaker"]:


Function DSSProject.new_recipe refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-23T14:44:05Z

-        already_exists = False
-        for rule in found_eo["rules"]:
-            if rule["targetProject"] == target_project:
-                already_exists = True
-                break
+        already_exists = any(
+            rule["targetProject"] == target_project for rule in found_eo["rules"]
+        )


Function DSSProjectSettings.add_exposed_object refactored with the following changes:

Use any() instead of for loop (use-any)

sourcery-ai · 2021-03-23T14:44:09Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.39%.

Quality metrics	Before	After	Change
Complexity	2.16 ⭐	1.97 ⭐	-0.19 👍
Method Length	29.77 ⭐	29.56 ⭐	-0.21 👍
Working memory	8.30 🙂	8.27 🙂	-0.03 👍
Quality	80.23% ⭐	80.62% ⭐	0.39% 👍

Other metrics	Before	After	Change
Lines	2374	2375	1

Changed files	Quality Before	Quality After	Quality Change
dataikuapi/dssclient.py	81.22% ⭐	81.53% ⭐	0.31% 👍
dataikuapi/dss/project.py	79.64% ⭐	80.08% ⭐	0.44% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
dataikuapi/dss/project.py	DSSProject.new_recipe	16 🙂	178 😞	28 ⛔	30.13% 😞	Try splitting into smaller methods. Extract out complex expressions
dataikuapi/dssclient.py	DSSClient.create_meaning	5 ⭐	116 🙂	14 😞	55.31% 🙂	Extract out complex expressions
dataikuapi/dss/project.py	DSSProject.duplicate	2 ⭐	70 🙂	18 ⛔	60.50% 🙂	Extract out complex expressions
dataikuapi/dssclient.py	DSSClient.sql_query	1 ⭐	60 ⭐	20 ⛔	61.62% 🙂	Extract out complex expressions
dataikuapi/dssclient.py	DSSClient._perform_http	5 ⭐	94 🙂	11 😞	62.98% 🙂	Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Let us know what you think of it by mentioning @sourcery-ai in a comment.

pbailly added 8 commits February 25, 2021 21:59

Use the new REST API for Jupyter Notebook State. [ch61633]

444d9bd

Apply review. [ch61633]

ac13aea

Prevent empty save.

2d123af

Rework API [ch61633]

7f1e16a

Add missing file. [ch61633]

b44a921

Separe legacy API from the new API.

2f0464b

Improve code consistency.

e6d6aae

Improve session handling.

d76048e

sourcery-ai Bot requested a review from pbailly March 22, 2021 17:04

cstenac changed the title ~~[9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored)~~ [TEST - IGNORE] [9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored) Mar 22, 2021

Tweak after code review.

cf8a93e

sourcery-ai Bot changed the title ~~[TEST - IGNORE] [9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored)~~ [9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored) Mar 23, 2021

sourcery-ai Bot force-pushed the sourcery/task/dss-91-improve-jupyter-api branch from 494f84d to 4cf4702 Compare March 23, 2021 13:37

pbailly and others added 2 commits March 23, 2021 15:43

Remove warnings.

cce9e91

'Refactored by Sourcery'

15e0e57

sourcery-ai Bot force-pushed the sourcery/task/dss-91-improve-jupyter-api branch from 4cf4702 to 15e0e57 Compare March 23, 2021 14:43

sourcery-ai Bot commented Mar 23, 2021

View reviewed changes

Base automatically changed from task/dss-91-improve-jupyter-api to release/9.0 March 23, 2021 15:05

sourcery-ai Bot closed this Mar 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored)#127

[9.0.1] Improve Jupyter Notebook REST API [ch61633] (Sourcery refactored)#127
sourcery-ai[bot] wants to merge 11 commits into
release/9.0from
sourcery/task/dss-91-improve-jupyter-api

sourcery-ai Bot commented Mar 22, 2021 •

edited

Loading

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot Mar 23, 2021

Uh oh!

sourcery-ai Bot commented Mar 23, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		if isinstance(v, str) or isinstance(v, unicode):
		if isinstance(v, (str, unicode)):

		if as_type == "objects" or as_type == "object":
		if as_type in ["objects", "object"]:

		elif type == "prepare" or type == "shaker":
		elif type in ["prepare", "shaker"]:

Uh oh!

Conversation

sourcery-ai Bot commented Mar 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 23, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot commented Mar 23, 2021

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

sourcery-ai Bot commented Mar 22, 2021 •

edited

Loading